From a1273ec5dd4965f076214a3f0d42e4c0c86c231d Mon Sep 17 00:00:00 2001 From: Jimi Xenidis Date: Tue, 24 Oct 2006 19:11:00 -0400 Subject: [PATCH] [TOOLS][POWERPC]fixes to put back commandline in prose builder The following patch puts back a couple of lines of code which copies the specified command line to the start info structure. Must have gotten lost in prior merges. Signed-off-by: Jonathan Appavoo Signed-off-by: Jimi Xenidis Signed-off-by: Hollis Blanchard --HG-- extra : transplant_source : %91H%F7%81m%00%BCE%A8yZQ%19%DB%99I%89J%3F%89 --- tools/libxc/powerpc64/xc_prose_build.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxc/powerpc64/xc_prose_build.c b/tools/libxc/powerpc64/xc_prose_build.c index ae68bf1fa4..1d5bc7e053 100644 --- a/tools/libxc/powerpc64/xc_prose_build.c +++ b/tools/libxc/powerpc64/xc_prose_build.c @@ -16,6 +16,7 @@ * Copyright (C) IBM Corporation 2006 * * Authors: Hollis Blanchard + * Jonathan Appavoo */ #include @@ -208,6 +209,9 @@ static unsigned long create_start_info( start_info->store_evtchn = store_evtchn; start_info->console.domU.mfn = (rma_top >> PAGE_SHIFT) - 3; start_info->console.domU.evtchn = console_evtchn; + strncpy((char *)start_info->cmd_line, cmdline, MAX_GUEST_CMDLINE); + /* just in case we truncated cmdline with strncpy add 0 at the end */ + start_info->cmd_line[MAX_GUEST_CMDLINE-1]=0; start_info_addr = rma_top - 4*PAGE_SIZE; rc = ft_set_rsvmap(devtree, 0, start_info_addr, 4*PAGE_SIZE); @@ -216,11 +220,9 @@ static unsigned long create_start_info( return ~0UL; } - return start_info_addr; } - static void free_page_array(xen_pfn_t *page_array) { free(page_array); -- 2.30.2